From cca4abf498309f3aff2a0d924f23b3d6bacc82d9 Mon Sep 17 00:00:00 2001 From: Tim Janik Date: Thu, 4 Apr 2002 23:10:58 +0000 Subject: [PATCH] fix segfault upon NULL return from gdk_utf8_to_string_target(). Fri Apr 5 01:06:15 2002 Tim Janik * gdk/x11/gdkwindow-x11.c (set_text_property): fix segfault upon NULL return from gdk_utf8_to_string_target(). * gdk/x11/gdkselection-x11.c (gdk_utf8_to_string_target): fix return value comment to mention NULL returns upon EMFILE. --- ChangeLog | 9 +++++++++ ChangeLog.pre-2-10 | 9 +++++++++ ChangeLog.pre-2-2 | 9 +++++++++ ChangeLog.pre-2-4 | 9 +++++++++ ChangeLog.pre-2-6 | 9 +++++++++ ChangeLog.pre-2-8 | 9 +++++++++ gdk/x11/gdkselection-x11.c | 3 ++- gdk/x11/gdkwindow-x11.c | 2 +- 8 files changed, 57 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 74b18219f3..cf4123ae6a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +Fri Apr 5 01:06:15 2002 Tim Janik + + * gdk/x11/gdkwindow-x11.c (set_text_property): fix segfault + upon NULL return from gdk_utf8_to_string_target(). + + * gdk/x11/gdkselection-x11.c (gdk_utf8_to_string_target): fix + return value comment to mention NULL returns upon EMFILE. + Thu Apr 4 22:35:42 2002 Soeren Sandmann * tests/testgtk.c (menu_items): revert accidentally commited @@ -34,6 +42,7 @@ Thu Apr 4 22:28:08 2002 Soeren Sandmann static color. Tue Apr 2 11:10:13 2002 Jonathan Blandford + * gtk/gtkliststore.c (gtk_list_store_set_sort_func): set the sort_func correctly, 77030 diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 74b18219f3..cf4123ae6a 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,11 @@ +Fri Apr 5 01:06:15 2002 Tim Janik + + * gdk/x11/gdkwindow-x11.c (set_text_property): fix segfault + upon NULL return from gdk_utf8_to_string_target(). + + * gdk/x11/gdkselection-x11.c (gdk_utf8_to_string_target): fix + return value comment to mention NULL returns upon EMFILE. + Thu Apr 4 22:35:42 2002 Soeren Sandmann * tests/testgtk.c (menu_items): revert accidentally commited @@ -34,6 +42,7 @@ Thu Apr 4 22:28:08 2002 Soeren Sandmann static color. Tue Apr 2 11:10:13 2002 Jonathan Blandford + * gtk/gtkliststore.c (gtk_list_store_set_sort_func): set the sort_func correctly, 77030 diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 74b18219f3..cf4123ae6a 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,11 @@ +Fri Apr 5 01:06:15 2002 Tim Janik + + * gdk/x11/gdkwindow-x11.c (set_text_property): fix segfault + upon NULL return from gdk_utf8_to_string_target(). + + * gdk/x11/gdkselection-x11.c (gdk_utf8_to_string_target): fix + return value comment to mention NULL returns upon EMFILE. + Thu Apr 4 22:35:42 2002 Soeren Sandmann * tests/testgtk.c (menu_items): revert accidentally commited @@ -34,6 +42,7 @@ Thu Apr 4 22:28:08 2002 Soeren Sandmann static color. Tue Apr 2 11:10:13 2002 Jonathan Blandford + * gtk/gtkliststore.c (gtk_list_store_set_sort_func): set the sort_func correctly, 77030 diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 74b18219f3..cf4123ae6a 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,11 @@ +Fri Apr 5 01:06:15 2002 Tim Janik + + * gdk/x11/gdkwindow-x11.c (set_text_property): fix segfault + upon NULL return from gdk_utf8_to_string_target(). + + * gdk/x11/gdkselection-x11.c (gdk_utf8_to_string_target): fix + return value comment to mention NULL returns upon EMFILE. + Thu Apr 4 22:35:42 2002 Soeren Sandmann * tests/testgtk.c (menu_items): revert accidentally commited @@ -34,6 +42,7 @@ Thu Apr 4 22:28:08 2002 Soeren Sandmann static color. Tue Apr 2 11:10:13 2002 Jonathan Blandford + * gtk/gtkliststore.c (gtk_list_store_set_sort_func): set the sort_func correctly, 77030 diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 74b18219f3..cf4123ae6a 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,11 @@ +Fri Apr 5 01:06:15 2002 Tim Janik + + * gdk/x11/gdkwindow-x11.c (set_text_property): fix segfault + upon NULL return from gdk_utf8_to_string_target(). + + * gdk/x11/gdkselection-x11.c (gdk_utf8_to_string_target): fix + return value comment to mention NULL returns upon EMFILE. + Thu Apr 4 22:35:42 2002 Soeren Sandmann * tests/testgtk.c (menu_items): revert accidentally commited @@ -34,6 +42,7 @@ Thu Apr 4 22:28:08 2002 Soeren Sandmann static color. Tue Apr 2 11:10:13 2002 Jonathan Blandford + * gtk/gtkliststore.c (gtk_list_store_set_sort_func): set the sort_func correctly, 77030 diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 74b18219f3..cf4123ae6a 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,11 @@ +Fri Apr 5 01:06:15 2002 Tim Janik + + * gdk/x11/gdkwindow-x11.c (set_text_property): fix segfault + upon NULL return from gdk_utf8_to_string_target(). + + * gdk/x11/gdkselection-x11.c (gdk_utf8_to_string_target): fix + return value comment to mention NULL returns upon EMFILE. + Thu Apr 4 22:35:42 2002 Soeren Sandmann * tests/testgtk.c (menu_items): revert accidentally commited @@ -34,6 +42,7 @@ Thu Apr 4 22:28:08 2002 Soeren Sandmann static color. Tue Apr 2 11:10:13 2002 Jonathan Blandford + * gtk/gtkliststore.c (gtk_list_store_set_sort_func): set the sort_func correctly, 77030 diff --git a/gdk/x11/gdkselection-x11.c b/gdk/x11/gdkselection-x11.c index 3ddd69e036..dc37ecc365 100644 --- a/gdk/x11/gdkselection-x11.c +++ b/gdk/x11/gdkselection-x11.c @@ -591,7 +591,8 @@ sanitize_utf8 (const gchar *src) * * Return value: the newly-allocated string, or %NULL if the * conversion failed. (It should not fail for - * any properly formed UTF-8 string.) + * any properly formed UTF-8 string unless system + * limits like memory or file descriptors are exceeded.) **/ gchar * gdk_utf8_to_string_target (const gchar *str) diff --git a/gdk/x11/gdkwindow-x11.c b/gdk/x11/gdkwindow-x11.c index c3379f76ee..912907d348 100644 --- a/gdk/x11/gdkwindow-x11.c +++ b/gdk/x11/gdkwindow-x11.c @@ -1819,7 +1819,7 @@ set_text_property (GdkWindow *window, { prop_type = XA_STRING; prop_text = gdk_utf8_to_string_target (utf8_str); - prop_length = strlen (prop_text); + prop_length = prop_text ? strlen (prop_text) : 0; prop_format = 8; } else -- 2.30.2